From: Ian Jackson Date: Thu, 20 Jan 2011 16:32:33 +0000 (+0000) Subject: libxl: do not attempt to write "shutdown" dm-command X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~10901 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=1da4ffed6fc715d2593f96925ecb98773b1de8df;p=xen.git libxl: do not attempt to write "shutdown" dm-command libxl_domain_destroy writes the command "shutdown" to the xenstore node with which it communicates with qemu. However: - qemu does not understand this command and ignores it (printing a message) - libxl doesn't wait for the answer and immediately pauses the domain anyway - destroy is the ungraceful (force) operation and should not negotiate with qemu anyway - even in the graceful shutdown case, there would actually be nothing that qemu needs to do. Under some circumstances, this entry in xenstore will survive the domain's death, ie be leaked. So remove the erroneous code. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 7ffb985b86..a8f71951a9 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -682,11 +682,6 @@ int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid, int force) if (libxl_device_pci_shutdown(ctx, domid) < 0) LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "pci shutdown failed for domid %d", domid); - if (dm_present) { - xs_write(ctx->xsh, XBT_NULL, - libxl__sprintf(&gc, "/local/domain/0/device-model/%d/command", domid), - "shutdown", strlen("shutdown")); - } rc = xc_domain_pause(ctx->xch, domid); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_domain_pause failed for %d", domid);